From: Joakim Verona <joakim@verona.se>
Date: Tue, 27 Aug 2013 08:12:21 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c8d61aef58410a28fda7fbdf1bd49aa00c25d815;p=emacs.git

merge from trunk
---

c8d61aef58410a28fda7fbdf1bd49aa00c25d815